From: Jeremy Bícha <jbicha@ubuntu.com>
Date: Mon, 2 Feb 2026 15:52:59 +0000 (-0500)
Subject: Re-enable composefs support on architectures where it is available
X-Git-Tag: archive/raspbian/2026.2-1+rpi1~1^2~12
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=eece0b1505b256fd14fc170529da2c4bb2e614c8;p=ostree.git

Re-enable composefs support on architectures where it is available

Revert "d/rules: Disable libcomposefs support"

This reverts commit 4087ee31f76d030e85b73e20e67329a5a2fd8f6e.
---

diff --git a/debian/control b/debian/control
index f049cfb4..af2fa289 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends:
  bison,
  bsdextrautils <!nocheck>,
  ca-certificates,
+ composefs [!alpha !hppa !m68k !sh4] <!nocheck>,
  cpio,
  docbook-xml <!nodoc>,
  docbook-xsl <!nodoc>,
@@ -33,6 +34,7 @@ Build-Depends:
  libavahi-client-dev,
  libavahi-glib-dev,
  libcap-dev,
+ libcomposefs-dev [!alpha !hppa !m68k !sh4],
  libcurl4-openssl-dev | libcurl-dev,
  libext2fs-dev,
  libfuse3-dev,
@@ -103,6 +105,7 @@ Depends:
  libarchive-dev,
  libavahi-client-dev,
  libavahi-glib-dev,
+ libcomposefs-dev [!alpha !hppa !m68k !sh4],
  libcurl4-openssl-dev | libcurl-dev,
  libglib2.0-dev,
  libgpg-error-dev,
@@ -203,6 +206,7 @@ Depends:
  attr,
  bsdextrautils,
  ca-certificates,
+ composefs [!alpha !hppa !m68k !sh4],
  cpio,
  fuse3,
  gir1.2-ostree-1.0,
diff --git a/debian/rules b/debian/rules
index d5ad8be8..9682e6b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,6 @@ configure_options = \
 	--with-selinux \
 	--with-systemdsystemgeneratordir=/usr/lib/systemd/system-generators \
 	--with-systemdsystemunitdir=/usr/lib/systemd/system \
-	--without-composefs \
 	--without-smack \
 	$(NULL)
 
@@ -37,6 +36,12 @@ ifneq ($(filter alpha hppa m68k powerpc sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
 configure_options += ac_cv_path_GJS=
 endif
 
+ifneq ($(filter alpha hppa m68k sh4,$(DEB_HOST_ARCH)),)
+configure_options += --without-composefs
+else
+configure_options += --with-composefs
+endif
+
 ifneq ($(filter libostree-doc,$(binaries)),)
 configure_options += --enable-gtk-doc
 else
diff --git a/debian/tests/control b/debian/tests/control
index fc3a3e6e..49837005 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -27,5 +27,6 @@ Restrictions:
  superficial,
 Depends:
  build-essential,
+ composefs [!alpha !hppa !m68k !sh4],
  libostree-dev,
  pkgconf,